Various changes linked to deployment