A handful of very small fixes.