few updates for production build