Small updates/fixes
Merge branch 'dev' of https://github.com/ibmmxlabs/v18 into dev