FIx some more stuff