Fix up some ugliness lying around