Fix up some issues