Some sane defaults aswell

Change-Id: I4ac6a754f8dc282428d9dedf39a61b3af3559e7c
Conflicts

Change-Id: I39227b9bf508cfe6d07fcb5227f68c1e313f5e28