Fixes for HW12 per Oksana's comments