Fixed some non-set vars
Merge branch 'build-optimization' of https://github.com/ibmmxlabs/v18 into build-optimization