Fixup of rather stupid mistakes.