Small fixes for Nightbane