Milestone 1 fixes