Ok, I'll update and file a Code Quality bug to fix the others