Fix issues (8/14)

Fix issues