Now REALLY final build script changes....