Fixed types so we can eventually handle 16PB files.