Build fixes. We're now using xtext 2.7.1