Additional deployment tweaks