FMU-XX - typefixes