Moar code fixes