fixup some