JSF3 corrections