Set some new defaults

Change-Id: I6f893a3aed828f0d81e6bbd3bb3ee2ea5fecd2c9