Fixins

A bit bored and tired, just a couple of things that could be merged now or maybe after B2.