More PVS studio warnings fixed