@weakify/@strongify in a couple missing places.