Nodiatis: Compatibility enhancements.

Compatibility enhancements.