Fixes for EpiCollectplus-4 and EpiCollectplus-6