Merge in International Fixes

Woohoo!