Add production mode differences and better message log handling