Fix issues (7/14)

Fix issues