Minor tidying, buildscript fixes.