Fix deadline calculation and display