Fix some redundant failure messages