fixup more bugs