Fixed a couple of things
Fixed a couple of things