Bunch of crap fixes for borks from recent additions