More consistency fixes.