Fixing issues with production