diff --git a/common/wildcards_and_files_ext.cpp b/common/wildcards_and_files_ext.cpp
index a147dda47f..2e2a7efb40 100644
--- a/common/wildcards_and_files_ext.cpp
+++ b/common/wildcards_and_files_ext.cpp
@@ -227,7 +227,10 @@ wxString ComponentFileWildcard()
 // Wildcard for reports and fabrication documents
 wxString DrillFileWildcard()
 {
-    return _( "Drill files (*.drl)|*." ) + FormatWildcardExt( "drl" );
+    //return _( "Drill files (*.drl)|*." ) + FormatWildcardExt( "drl" );
+    return _( "Drill files (*.drl *.nc *.xnc)|*." ) + FormatWildcardExt( "drl" )
+              + ";*." + FormatWildcardExt( "nc" )
+              + ";*." + FormatWildcardExt( "xnc" );
 }
 
 
diff --git a/gerbview/files.cpp b/gerbview/files.cpp
index 07468cbde3..e83c334061 100644
--- a/gerbview/files.cpp
+++ b/gerbview/files.cpp
@@ -174,7 +174,7 @@ void GERBVIEW_FRAME::Files_io( wxCommandEvent& event )
         break;
 
     default:
-        wxFAIL_MSG( wxT( "File_io: unexpected command id" ) );
+        wxFAIL_MSG( "File_io: unexpected command id" );
         break;
     }
 }