Fixed a few thingies