- Fixed few bugs due to bad type