Fix everything wonderfully

Change-Id: I4aac367b50a6d35f33185a467a57c7b3ecbdc3eb