fix a couple defaults on a clean flash

Change-Id: I492afa3268260f8a8520658035817d102bd08521