Fix analysis attributes
Fix analysis attributes
Fix analysis bugs