Fix problems (6/25)

Fix problems