diff --git a/build/tools/wxwidgets.iss b/build/tools/wxwidgets.iss
index b2aded70d7..87859ff75c 100644
--- a/build/tools/wxwidgets.iss
+++ b/build/tools/wxwidgets.iss
@@ -31,7 +31,7 @@ InfoBeforeFile={#INNODIR}\docs\readme.txt
 InfoAfterFile={#INFOFILE}
 OutputDir=c:\daily
 OutputBaseFilename={#SETUPFILENAME}
-PrivilegesRequired=none
+PrivilegesRequired=none
 SetupIconFile={#INNODIR}\art\wxwin.ico
 Compression=lzma
 SolidCompression=yes
@@ -51,7 +51,7 @@ Source: "{#INNODIR}\docs\msw\install.txt"; DestDir: "{app}\docs\msw";  Flags: ig
 Filename: "{app}\wx.url"; Section: "InternetShortcut"; Key: "URL"; String: "http://www.wxwidgets.org"
 
 [Icons]
-Name: "{group}\{cm:ProgramOnTheWeb,wxWidgets}"; Filename: "{app}\wx.url"
+Name: "{group}\{cm:ProgramOnTheWeb,wxWidgets}"; Filename: "{app}\wx.url"
 Name: {group}\wxWidgets Manual; Filename: {app}\docs\htmlhelp\wx.chm; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
 Name: {group}\Changes; Filename: {app}\docs\changes.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
 Name: {group}\Readme; Filename: {app}\docs\readme.txt; WorkingDir: {app}; IconIndex: 0; Flags: useapppaths
diff --git a/src/common/datavcmn.cpp b/src/common/datavcmn.cpp
index 79b97c5c41..9ee735abad 100644
--- a/src/common/datavcmn.cpp
+++ b/src/common/datavcmn.cpp
@@ -742,8 +742,6 @@ void wxDataViewRendererBase::DestroyEditControl()
 
     wxPendingDelete.Append(handler);
     wxPendingDelete.Append(m_editorCtrl);
-
-    m_editorCtrl = NULL;
 }
 
 void wxDataViewRendererBase::CancelEditing()