Fix issues (6/14)

Fix issues