fixup entries