(no-ticket) Various fixes

Change-Id: Id35827371a9c109072f58aa6c698b5116730997b