Minor improvements of rendering