Changes necessary for dev/prod