New NightTools: Minor fixes