Fix problems (10/25)

Fix problems