Fixes

Change-Id: I8907f68bfe09aa2c53f3bfea749d383a3b6f02df