Fix Coverity #1216798 #1216797 #1216796 #1216795 #1216794
Reformatting and another enum
Fix scan error