fixes for newer versions of EE