Fixes

Change-Id: I8ba0629ad1481aca0ed937b65b35992709964973