Fix/1332 fedissues

A whole load of FED tweaks relating to issue #1332.