More fixes

Change-Id: Id85355e9b75014ba4c6be0808c39a9c974abb11d