Fix up small issues