Fix hard coded messages