Fixes Staleness behavior and specs