Fix token sizes again