A set of minor fixes