Changes for compilation failure of O5E plugin