Fixed a couple of things