Fixed issues (10/15)

Fixed issues