More offline rendering improvements.