Fixed Xtend 2.5 Compile Issues