Fixing issues mentioned in review.