Significant fixes.