[CXF-6131] Minor updates