Some derp moments

Change-Id: Ie966f520277a7eb3373a97fcdde7d6989a125ae5