fix various glitches for getting this branch to pass wsdl generation