Small consistency fixes (trivial).