Fixed a few things again