some good fixes, @radhermit can we get a bump going? thanks mate Reproducible: Always
Added to the tree.