Fixed issues pointed out in the review