EPOBC and required fixes