Make our build a bit smoother