Addressed CodePro issues