more tweaks for deployment