Prefast fixes