Uncommitted changes from UAT fixes.

These were fixes made after 8/21 update and were not committed.