Fixed a couple of very silly bugs