Few fixes for SantaIsComing