A set of tiny improvements