Alignment with both Dev and Production Servers

Code changes that allow the app to work on both development and
production servers.