Fixed a couple of small issues