Day 15, fixes