Made changes for reported issues