Compatibility v4.4 fixes