PVS suggested fixes