Solving dev/prod environment issues