Fixed a couple of stuff