Updates to some more of the FFL related classes.