general fixup