Fixes for docker deployments