INSANITY BUG FIXES