FEPS related fixes (HHRU)