few fixup