More build procedure modifications.