fix int size issues