ENH Fixes for Day 6