Buildscript fixes.