Call management work, and small bugfixes.