Final adjustments to get dev and prod working