small changes for OptiWrangler cluster compatibility