Fixed up issues with preview rendering after 1.7 upgrade
Merge pull request #378 from JakeGinnivan/FixedPreviewRendering

Fixed up issues with preview rendering after 1.7 upgrade