Fixed the tuple warnings