Expanded fixes.