fixup some issues