Cleanup and fixes for latest EE versions