More fixes for preview