multiple fixup errors fixed