Iteration 1 fixes