Changed build a bit