Fix issues (5/14)

Fix issues