Fix #1126 - YSOD in Dynamic Data

Fixes #1126 

A few extra changes got pulled in to the PR because of the cross domain policy file change, sorry about that.