More buildscript tweaks.