More error message formatting improvements