Complete -WEAK changes