[NONISSUE] Changes for production configuration