fixes for preview