Refactoring fixes for SantaIsComing

Few fixes to follow up on #1176