Handful of small non-functional fixes