Fix for dev/production port issues