Better deadline handling when not set