Made changes for reported issues
Made changes for the reported issues