Make defaults consistent with ICAT