Fix codes (8/20)

Fix codes