Fixed a couple of other things..