Fixes to JSF components after refactoring