More fiexes for v12 ISO issues.