Fixes for iteration 3