Misc fixes for SantaIsComing