Some more defaults

Change-Id: I91ae81885306f497d10a27f3d76f3492a5cc7437