Fixed a couple stupid bugs