Minor fixes
Merge branch 'futureParser' into devel