Minor tuple improvements