Fixed build setup (again)