Make fixes

Change-Id: I56307447a17128822ce526546cdc2e7a5541ad4b