preview fixes
Merge pull request #112 from extension/fix_preview

preview fixes due to library change