Various small consistency fixes (trivial):