Fix error messages to bring them in line with old values