Fixing PVCS warnings