Minor buildscript fixes