MNT: NCDC format fixes