More deployment tweaks