few more fixed in EFA-Configure