A bundle of robustifying the head/tail timing bomb and general server code cleanups