Fixes to work with newest FIFE