Crush more errors

Change-Id: I82df82300303791cabee5887a17881ed7d9c27f1