Fixed issues from latest comments.