more truncate fixes