a few Advent fixes