Fixed tupleviewer issues