Fixed remaining fields so they work for typical products