Rolling some fixes into a minor bump