Small fixes

Change-Id: I9ea953583d6ce25d9334b760ce7ceebf1123bdec