As mentioned previously, I think we should default both of these to `true`