Issue #37: more tweaks to deployment config