Fixed more broken stuff