Fixed some tuple interactions