Fixes to Preview