Yet more error message fixes