Misc improvements from jlaanstra/reactiveui