Some more preview tweaks,