fix outstanding deadlines and messages