Final Adjustments to the buildscript