Interaction fixes