Better handling of marking stale containers