Bugs fixes and FEPS 2.0 compatibility