Minor rendering fixes