Fix problems (17/25)

Fix problems