Config fixes & e-plus upgrade