Fix some issues with the interact events