Bug fixes, and changes to work with 1.21.x series of FEU.