fixes for EE 2.6+