Fixed issues (13/15)

Fixed issues