More tuning to avoid downtimes