Fixing more stuff for the assignment