Fixed (again) quality code control checks