Fixed some issues from feedbacks