Minor fixes due to comment.