Price set field/options sort order issues

Odd sort/weight ordering occurs in two places I have found so far:
1. When managing/editing a price field with more than 9 price options.
2. When emailing an event confirmation receipt with multiple price set fields/options.

Expected behavior would be for price sets to be ordered by default in:
Price set (by weight) then Price set field (by weight) then Price set field option (by weight) everywhere they appear.

The attached examples show:
1. managing price set options and the order being wrong by default.
2. an email with multiple fields/options presented in random order.. They should be friday/saturday/sunday as that is the order of the price fields/options.