Consistency fix and clean up