Bugfixes / Usage of Xtend