Minor fixes to OptiWrangler