Fix deprecation warnings in EE 2.6+