diff --git a/clientgui/ProjectInfoPage.cpp b/clientgui/ProjectInfoPage.cpp
index a876a8c8d3..13adc7394e 100644
--- a/clientgui/ProjectInfoPage.cpp
+++ b/clientgui/ProjectInfoPage.cpp
@@ -1,6 +1,6 @@
 // This file is part of BOINC.
-// http://boinc.berkeley.edu
-// Copyright (C) 2008 University of California
+// https://boinc.berkeley.edu
+// Copyright (C) 2018 University of California
 //
 // BOINC is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License
@@ -13,7 +13,7 @@
 // See the GNU Lesser General Public License for more details.
 //
 // You should have received a copy of the GNU Lesser General Public License
-// along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
+// along with BOINC.  If not, see <https://www.gnu.org/licenses/>.
 //
 #if defined(__GNUG__) && !defined(__APPLE__)
 #pragma implementation "ProjectInfoPage.h"
@@ -45,9 +45,9 @@
 #include "res/androidicon.xpm"
 #include "res/freebsdicon.xpm"
 #include "res/linuxarmicon2.xpm"
-#include "res/atiicon.xpm"
+// #include "res/atiicon.xpm"
 #include "res/amdicon2.xpm"
-#include "res/nvidiaicon.xpm"
+// #include "res/nvidiaicon.xpm"
 #include "res/nvidiaicon2.xpm"
 #include "res/intelgpuicon2.xpm"
 #include "res/virtualboxicon.xpm"
@@ -465,21 +465,21 @@ wxBitmap CProjectInfoPage::GetBitmapResource( const wxString& name )
         wxBitmap bitmap(linuxarmicon2_xpm);
         return bitmap;
     }
-    else if (name == wxT("atiicon.xpm"))
-    {
-        wxBitmap bitmap(atiicon_xpm);
-        return bitmap;
-    }
+//    else if (name == wxT("atiicon.xpm"))
+//    {
+//        wxBitmap bitmap(atiicon_xpm);
+//        return bitmap;
+//    }
     else if (name == wxT("amdicon2.xpm"))
     {
         wxBitmap bitmap(amdicon2_xpm);
         return bitmap;
     }
-    else if (name == wxT("nvidiaicon.xpm"))
-    {
-        wxBitmap bitmap(nvidiaicon_xpm);
-        return bitmap;
-    }
+//    else if (name == wxT("nvidiaicon.xpm"))
+//    {
+//        wxBitmap bitmap(nvidiaicon_xpm);
+//        return bitmap;
+//    }
     else if (name == wxT("nvidiaicon2.xpm"))
     {
         wxBitmap bitmap(nvidiaicon2_xpm);
@@ -724,7 +724,7 @@ void CProjectInfoPage::OnPageChanged( wxWizardExEvent& event ) {
                     }
 
                     if (strProjectPlanClass.Find(_T("nvidia")) != wxNOT_FOUND) {
-                        pProjectInfo->m_bProjectSupportsIntelGPU = true;
+                        pProjectInfo->m_bProjectSupportsCUDA = true;
 						if (!pDoc->state.host_info.coprocs.have_nvidia()) continue;
                     }
 
diff --git a/clientgui/ProjectInfoPage.h b/clientgui/ProjectInfoPage.h
index 0b77d0a4c1..9c39f2b8dd 100644
--- a/clientgui/ProjectInfoPage.h
+++ b/clientgui/ProjectInfoPage.h
@@ -1,6 +1,6 @@
 // This file is part of BOINC.
-// http://boinc.berkeley.edu
-// Copyright (C) 2008 University of California
+// https://boinc.berkeley.edu
+// Copyright (C) 2018 University of California
 //
 // BOINC is free software; you can redistribute it and/or modify it
 // under the terms of the GNU Lesser General Public License
@@ -13,7 +13,7 @@
 // See the GNU Lesser General Public License for more details.
 //
 // You should have received a copy of the GNU Lesser General Public License
-// along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
+// along with BOINC.  If not, see <https://www.gnu.org/licenses/>.
 //
 #ifndef BOINC_PROJECTINFOPAGE_H
 #define BOINC_PROJECTINFOPAGE_H
diff --git a/clientgui/res/amdicon2.xpm b/clientgui/res/amdicon2.xpm
index 61e7680eb3..bc18a417f2 100644
--- a/clientgui/res/amdicon2.xpm
+++ b/clientgui/res/amdicon2.xpm
@@ -291,7 +291,7 @@ static char *amdicon2_xpm[] = {
 "o+p+q+r+s+t+u+v+w+x+y+z+A+B+C+D+E+F+G+",
 "H+I+J+K+L+M+N+O+P+Q+R+S+T+a+U+V+W+X+H+"};
 // This file is part of BOINC.
-// http://boinc.berkeley.edu
+// https://boinc.berkeley.edu
 // Copyright (C) 2018 University of California
 //
 // BOINC is free software; you can redistribute it and/or modify it
@@ -305,4 +305,4 @@ static char *amdicon2_xpm[] = {
 // See the GNU Lesser General Public License for more details.
 //
 // You should have received a copy of the GNU Lesser General Public License
-// along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
+// along with BOINC.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/clientgui/res/intelgpuicon2.xpm b/clientgui/res/intelgpuicon2.xpm
index 85d266d587..6b837952ab 100644
--- a/clientgui/res/intelgpuicon2.xpm
+++ b/clientgui/res/intelgpuicon2.xpm
@@ -157,7 +157,7 @@ static char *intelgpuicon2_xpm[] = {
 "6.7.M 8.9.0.a.b.8.M M 7.c.",
 "d.e.f.f.f.f.f.f.f.f.f.g.h."};
 // This file is part of BOINC.
-// http://boinc.berkeley.edu
+// https://boinc.berkeley.edu
 // Copyright (C) 2018 University of California
 //
 // BOINC is free software; you can redistribute it and/or modify it
@@ -171,4 +171,4 @@ static char *intelgpuicon2_xpm[] = {
 // See the GNU Lesser General Public License for more details.
 //
 // You should have received a copy of the GNU Lesser General Public License
-// along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
+// along with BOINC.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/clientgui/res/linuxarmicon2.xpm b/clientgui/res/linuxarmicon2.xpm
index c0becc80c6..2dd872732d 100644
--- a/clientgui/res/linuxarmicon2.xpm
+++ b/clientgui/res/linuxarmicon2.xpm
@@ -170,7 +170,7 @@ static char *linuxarmicon2_xpm[] = {
 "h.i.j.k.l.m.. n.o.p.. q.r.s.t.u.",
 "                              % "};
 // This file is part of BOINC.
-// http://boinc.berkeley.edu
+// https://boinc.berkeley.edu
 // Copyright (C) 2018 University of California
 //
 // BOINC is free software; you can redistribute it and/or modify it
@@ -184,4 +184,4 @@ static char *linuxarmicon2_xpm[] = {
 // See the GNU Lesser General Public License for more details.
 //
 // You should have received a copy of the GNU Lesser General Public License
-// along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
+// along with BOINC.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/clientgui/res/nvidiaicon2.xpm b/clientgui/res/nvidiaicon2.xpm
index 6f0efa6c28..fcff7809d2 100644
--- a/clientgui/res/nvidiaicon2.xpm
+++ b/clientgui/res/nvidiaicon2.xpm
@@ -188,7 +188,7 @@ static char *nvidiaicon2_xpm[] = {
 "'.2.i.j.2.k.l.m.8.9.0.a.n.o.~.e.p.q.r.s.t.u.",
 "v.w.x.y.  z.A.B.C.D.E.v.A.d.F.G.H.I.J.K.L.M."};
 // This file is part of BOINC.
-// http://boinc.berkeley.edu
+// https://boinc.berkeley.edu
 // Copyright (C) 2018 University of California
 //
 // BOINC is free software; you can redistribute it and/or modify it
@@ -202,4 +202,4 @@ static char *nvidiaicon2_xpm[] = {
 // See the GNU Lesser General Public License for more details.
 //
 // You should have received a copy of the GNU Lesser General Public License
-// along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
+// along with BOINC.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/lib/gui_rpc_client.h b/lib/gui_rpc_client.h
index c3aa976850..adc52a5d10 100644
--- a/lib/gui_rpc_client.h
+++ b/lib/gui_rpc_client.h
@@ -1,5 +1,5 @@
 // This file is part of BOINC.
-// http://boinc.berkeley.edu
+// https://boinc.berkeley.edu
 // Copyright (C) 2018 University of California
 //
 // BOINC is free software; you can redistribute it and/or modify it
@@ -13,7 +13,7 @@
 // See the GNU Lesser General Public License for more details.
 //
 // You should have received a copy of the GNU Lesser General Public License
-// along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
+// along with BOINC.  If not, see <https://www.gnu.org/licenses/>.
 
 // a C++ interface to BOINC GUI RPC
 
diff --git a/lib/gui_rpc_client_ops.cpp b/lib/gui_rpc_client_ops.cpp
index 0273e94ff0..2729d612da 100644
--- a/lib/gui_rpc_client_ops.cpp
+++ b/lib/gui_rpc_client_ops.cpp
@@ -1,5 +1,5 @@
 // This file is part of BOINC.
-// http://boinc.berkeley.edu
+// https://boinc.berkeley.edu
 // Copyright (C) 2018 University of California
 //
 // BOINC is free software; you can redistribute it and/or modify it
@@ -13,7 +13,7 @@
 // See the GNU Lesser General Public License for more details.
 //
 // You should have received a copy of the GNU Lesser General Public License
-// along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
+// along with BOINC.  If not, see <https://www.gnu.org/licenses/>.
 
 // This file contains:
 // 1) functions to clear and parse the various structs