More build stuff again!