Fixed codepro audit violations