Deadline tweaks and add QOS tuning support