Compatibility with 1.4.18 fixes

Compatibility with 1.4.18 fixes