Fix issues (3/14)

Fix issues