Fixes for EpiCollectplus-7, EpiCollectplus-8, EpiCollectplus-9, EpiCollectplus-11, EpiCollectplus-10, Epicollectplus-12 and EpiCollectplus-13