External Preview fixes