Fix Mark Simon's feedbacks