More wifi changes