Feature Analyzer fixes.