Corrected issues in this project