Final deployment tweaks