Correcting some code quality issues
Bug fixes