Day 3, fixes