minor fixes for Xtend 2.6