Minor Preview Fixes