Fix type and failure messages.