Fixed defaults for on demand settings