Fix some interactions. h/t @nicksergeant again