Fixed a few more changes