Fix ISO compliance