Call context store: minor fixes