Fixed Analyze issues.