Fixed issues from mail