- Fixed issues