Homework 6 fixes