More build fiddling