Fix hard coded strings