FIX: Assignment 6 fixes