The Great FE Refactor part 4
Fix up some more modules