Didn't want to bother making separate MRs for those trivial commits, so here they are in a single MR.