Adjusts

Change-Id: Ieecbec6d25427803c3d504620d700fe9955c02d7