Fixups following changes to actor traversal