Fixed a couple things