Fixed a couple of mistakes