Bugfixes from Mitchell and Aaron

Please get these up to the live site ASAP