NiteSpout fixes