Some more consistency fixes.