Fixes to production server