Minor consistency fixes