Fixes in validation based on the errors I'm seeing coming back creating surveys