Internal QA fixes, round 1

Package as at 21st Oct 2014
Staged at
http://ec2-54-169-50-198.ap-southeast-1.compute.amazonaws.com/gyg/