Handful of minor fixes