Fixing content issues from UAT