Minor enhancements
Compatibility changes for NFX.Glue