Attempting to get build to work predictably