More deploy tweaking