Fixed up issues with preview rendering after 1.7 upgrade