Modify build-all, should hopfully work now