fixing messages of r67094. thanks to siebrand for these suggestions