Various small updates [skip ci]