More fixes due to the recent merge. Still unstable.
Merge branch 'master' of https://github.com/cwi-swat/rascal.git