[gem] Cleanup and correct TX descriptors