Consistency fixes.