Resolve CR fixes.