Fix issues discovered during merge to EAP 6.1