Various deployment tweaks