Fixes to preview interactions