Various small changes

Nothing major.