Miscellaneous deployment tweaks