Re-work more defaults (again)

Signed-off-by: Alec Ari <neotheuser@ymail.com>