Fixes

Change-Id: I6f5e99684ec7690b9721a61500b8d2427bcbf4fc