more tweaks related to the generic SaturationState (mostly to get rid of
warnings) + adding missing files
forgot to move this fix to avoid NPE earlier