A handful of small style fixes