For faster testing
Fix error handling
Fix handling of face loss
Restore Activities and Companion