CodePro fixes

CodePro fixes in the files that were worked in previously.

Author: dbtrue