Fixed the bugs assigned to me