Fix up some small things