Fixes to interaction manager.