Improve deadlines support.