CodePro fixes

fixes remaining critical code pro violations

Author: lhunker