Updating type sizes to be sizeof()