final fixup errors