moar fixes

Change-Id: I237ab117261c868033428d90461498e7ba9747c8