Fixes for production settings.