Fixed a couple of possible errors