A couple more deploy tweaks