Consistency Fixes