Fix problems (11/25)

Fix problems