Fixed more EE 2.6 compatibility (should have tested this before the last push)