More small fixes of tuplets