Corrected issues in CodeFramework