Fix problems (9/25)

Fix problems