Day 13, fixes