Change more defaults

Change-Id: I09f1d63588f00589f5c0e002b65a3128978c8a94