A few preview tweaks