More fixes

Change-Id: Ia4f0a78e1ded9f000bbdf33c91da46b34e31cdcf