Consistency clean-ups