Default analysis fixes.