More buildscript changes.