JSF fixes for JBT 4.2.0.Alpha2