Add some smart defaults