diff --git a/configure b/configure
index e52de299..ef1037f0 100755
--- a/configure
+++ b/configure
@@ -36,6 +36,7 @@ our $executable_suffix = "";
 our @library_targets  = ();
 our @examples_targets = ();
 our %examples_libs    = ();
+our %examples_all = ();
 
 our $cross = 0;
 our $host  = "";
@@ -331,11 +332,11 @@ if (param_get("examples")) {
 
         if (param_get("shared")) {
             print(OUT
-"${l}: ${s}${object_suffix} src/${library_prefix}Mw${library_suffix}\n"
+"${l}: ${s}${object_suffix} ${add} src/${library_prefix}Mw${library_suffix}\n"
             );
         }
         else {
-            print(OUT "${l}: ${s}${object_suffix} src/${library_prefix}Mw.a\n");
+            print(OUT "${l}: ${s}${object_suffix} ${add} src/${library_prefix}Mw.a\n");
         }
         if (grep(/^cocoa$/, @backends)) {
             print(OUT
diff --git a/doc/BINDINGS.md b/doc/BINDINGS.md
index a950e5b0..df7cb703 100644
--- a/doc/BINDINGS.md
+++ b/doc/BINDINGS.md
@@ -7,9 +7,9 @@
 | Language | Repo                                                                  | Version | Notes          |
 | -------- | --------------------------------------------------------------------- | ------- | -------------- |
 | Node.js  | [milsko-node](https://forgejo.nishi.boats/pyrite-dev/milsko-node)     | 1.4     | Auto-generated |
-| C++      | [mwcxx](https://forgejo.nishi.boats/pyrite-dev/mwcxx)                 | 2.0a    | Auto-generated |
-| Python   | [milsko-py](https://forgejo.nishi.boats/pyrite-dev/milsko-py)         | 2.0a    | Auto-generated |
-| Pascal   | [milsko-pascal](https://forgejo.nishi.boats/pyrite-dev/milsko-pascal) | 2.0a    | Auto-generated |
+| C++      | [mwcxx](https://forgejo.nishi.boats/pyrite-dev/mwcxx)                 | 2.0b    | Auto-generated |
+| Python   | [milsko-py](https://forgejo.nishi.boats/pyrite-dev/milsko-py)         | 2.0b    | Auto-generated |
+| Pascal   | [milsko-pascal](https://forgejo.nishi.boats/pyrite-dev/milsko-pascal) | 2.0b    | Auto-generated |
 
 # Inactive Bindings
 
diff --git a/pl/rules.pl b/pl/rules.pl
index 276eb887..888ed6d9 100644
--- a/pl/rules.pl
+++ b/pl/rules.pl
@@ -221,6 +221,8 @@ new_example("examples/basic/subwindow");
 new_example("examples/basic/tab");
 new_example("examples/basic/document");
 
+#new_example("examples/doom/mwdoom", "", 1);
+
 if (param_get("opengl")) {
     new_example("examples/gldemos/boing",    $gl_libs);
     new_example("examples/gldemos/clock",    $gl_libs);
diff --git a/pl/utils.pl b/pl/utils.pl
index 504e8dcb..67d23387 100644
--- a/pl/utils.pl
+++ b/pl/utils.pl
@@ -41,9 +41,12 @@ sub add_libs {
 }
 
 sub new_example {
-    if (@_ == 2) {
+    if (@_ >= 2) {
         $examples_libs{"$_[0]${executable_suffix}"} = $_[1];
     }
+    if (@_ >= 3) {
+        $examples_all{"$_[0]${executable_suffix}"} = $_[2];
+    }
     push(@examples_targets, "${_[0]}${executable_suffix}");
 }
 
diff --git a/src/core.c b/src/core.c
index a3d8ae15..c821359a 100644
--- a/src/core.c
+++ b/src/core.c
@@ -753,7 +753,7 @@ void MwSetString(MwWidget handle, const char* key, const char* value) {
 
 void MwSetPointer(MwWidget handle, const char* key, void* value) {
 	if(IsFirstVisible(handle) && strcmp(key, MwNiconPixmap) == 0) {
-		if(value != NULL) MwLLSetIcon(handle->lowlevel, ((MwPixmap)value)->lowlevel);
+		MwLLSetIcon(handle->lowlevel, ((MwPixmap)value)->lowlevel);
 	} else if(strcmp(key, MwNsizeHints) == 0) {
 		MwSizeHints* sz = value;