Fix problems (7/25)

Fix problems