Fixed buildscripts