Fix some more broken stuff