Fixing issues for assignment2