Commit for bug fixes

Commit for bug fixes