minor fixes in efm tool