pvs_root - minor optimizations