Fix a couple of multi-region issues from the mantis tracker.