- Fixed some issues