minor fixes for Xtend 2.4.0 compatibility