- Fixed bugs