Bunch of fixed for on screwed up stuff