Fix several CodePro violations