Minor consistency updates