Fixes in production