Correct name of Ferm handler
Tidy up
Merge branch 'fix-ferm-handler'