Moonlight Mayhem: Small fixes

Small fixes