Changes from epatches fixing