Deploy/Profile tweaks