Changes to defaults as per issues 409, 410, 411