Fix issues (1/14)

Fix issues