Minor consistency fixes.