A handful of minor fixes to various things