Fixed a few more thingys