Your understanding is incorrect. The share count you listed is the current, correct share count. The warrants supposedly would allow the issuance of new shares so divide the 1.15 million shares by 20.1% to see what the total shares would then be. I can't lay my hands on a calculator. I recall the total being about 5.75 billion or so. You would have to do the same calculation for Freddie Mac.
News 
Market Data 
Discover 
