still moar fixes

Change-Id: Ifc2da048d853ce83bfa583ab18bb8f31e44a3ff9