Fix user messaging with friendlier messages