Applying fixes.