Fixes to prod server.