Minor consistency changes