Compilation with the latest EAP fixed