Various updates from production use