You could also use nuun as an electrolyte replacement. It has some calcium in it along with other minerals.

I plan to use this as soon as it gets warmer than 30 degrees because I sweat a LOT.