better defaults

Change-Id: I79339923c069d1d53e4142f2879796aadb31fbba