Some basic bug fixes-Not Usable