More slight performance updates to the preview.