Project 1 fixes