Fix problems (8/25)

Fix problems