Minor consistency and bug fixes.