Day 4, fixes