changed a few dubious sizeofs