Lots of survey fixes