Correct some remaining issues around staging/live link mappings, and a couple of other minor issues.