some tweaks to make OWF deployments work