Tweaks for build 1, version 1.8