fixes made with codepro tools