More tweaks to buildscript