Fix some more error messages