Fixes for re-investigation of Fimex
Final fixes for report