Day 9 Fixes