Fix some issues with the interaction