compatibility fixes for Xtend 2.4; fixed several minor bugs, too