Fix analysis errors
Fix analysis bugs
Add analysis attributes