Tweaks for preview