Fixed Analyze errors