keep in mind the OS increases, tracked and posted here on the board, could be due to both debt service AND share grants to various parties. until we get news/filings, there's no way to know how many shares in excess of the conversions may have been granted to various persons/entities... for various reasons.
so your math is likely correct, or at least in the ballpark.