moar fixes

Change-Id: Ib3a1dcac356453230a0188c9388333fe5f0cab4f