First try to fix the buildscript