Fixed some more broken stuff. Double Whoops