More buildscript fixes