WIP deployment tweaks