Fixup some issues