More crap fixes