Various fixes related to homework