Fixes for production