Made changes for reported issues
Made changes for reported issues