diff --git a/build.sh b/build.sh
index 62498975..0326d3e9 100755
--- a/build.sh
+++ b/build.sh
@@ -10,6 +10,7 @@ elif [ -f /etc/fedora-release ]; then
     echo "For best results, follow the steps in the script manually."
 fi
 # Build the toolchain:
+unset PKG_CONFIG_LIBDIR
 pushd toolchain
 ./prepare.sh
 ./install.sh
diff --git a/hdd/usr/share/login-background.bmp b/hdd/usr/share/login-background.bmp
deleted file mode 100644
index e890df8b..00000000
Binary files a/hdd/usr/share/login-background.bmp and /dev/null differ
diff --git a/toolchain/activate.sh b/toolchain/activate.sh
index ef10bde4..4438a86f 100755
--- a/toolchain/activate.sh
+++ b/toolchain/activate.sh
@@ -4,3 +4,4 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 . $DIR/config.sh
 
 export PATH="$DIR/local/bin:$PATH"
+export PKG_CONFIG_LIBDIR="$PREFIX/$TARGET/lib/pkgconfig"
diff --git a/userspace/compositor.c b/userspace/compositor.c
index 413e4cf7..bcb8dc29 100644
--- a/userspace/compositor.c
+++ b/userspace/compositor.c
@@ -427,7 +427,7 @@ void redraw_bounding_box_r(window_t *window, int32_t width, int32_t height, uint
 }
 
 
-wid_t volatile _next_wid = 0;
+wid_t volatile _next_wid = 1;
 
 void send_window_event (process_windows_t * pw, uint8_t event, w_window_t * packet) {
 	/* Construct the header */
diff --git a/userspace/glock.c b/userspace/glock.c
deleted file mode 100644
index 4d5e9a6a..00000000
--- a/userspace/glock.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * glock
- *
- * Graphical lock screen.
- */
-#include <stdlib.h>
-#include <assert.h>
-#include <math.h>
-
-#include <ft2build.h>
-#include FT_FREETYPE_H
-#include FT_CACHE_H
-
-#include "lib/window.h"
-#include "lib/graphics.h"
-
-sprite_t * sprites[128];
-sprite_t alpha_tmp;
-
-uint16_t win_width;
-uint16_t win_height;
-
-gfx_context_t * ctx;
-
-int center_x(int x) {
-	return (win_width - x) / 2;
-}
-
-int center_y(int y) {
-	return (win_height - y) / 2;
-}
-
-void init_sprite(int i, char * filename, char * alpha) {
-	sprites[i] = malloc(sizeof(sprite_t));
-	load_sprite(sprites[i], filename);
-	if (alpha) {
-		sprites[i]->alpha = 1;
-		load_sprite(&alpha_tmp, alpha);
-		sprites[i]->masks = alpha_tmp.bitmap;
-	} else {
-		sprites[i]->alpha = 0;
-	}
-	sprites[i]->blank = 0x0;
-}
-
-int main (int argc, char ** argv) {
-	setup_windowing();
-
-	int width  = wins_globals->server_width;
-	int height = wins_globals->server_height;
-
-	win_width = width;
-	win_height = height;
-
-
-	/* Do something with a window */
-#define PANEL_HEIGHT 24
-	window_t * wina = window_create(0, PANEL_HEIGHT, width, height - PANEL_HEIGHT);
-	assert(wina);
-	window_reorder (wina, 0xFFFF);
-	ctx = init_graphics_window_double_buffer(wina);
-
-	draw_fill(ctx, rgb(0,0,0));
-	flip(ctx);
-
-#if 1
-	printf("Loading background...\n");
-	init_sprite(0, "/usr/share/login-background.bmp", NULL);
-	printf("Background loaded.\n");
-	draw_sprite_scaled(ctx, sprites[0], 0, 0, width, height);
-#endif
-
-#if 1
-	init_sprite(1, "/usr/share/bs.bmp", "/usr/share/bs-alpha.bmp");
-	draw_sprite_scaled(ctx, sprites[1], center_x(sprites[1]->width), center_y(sprites[1]->height), sprites[1]->width, sprites[1]->height);
-#endif
-
-	flip(ctx);
-
-	while (1) {
-		char ch = 0;
-		w_keyboard_t * kbd;
-		do {
-			kbd = poll_keyboard();
-			if (kbd != NULL) {
-				ch = kbd->key;
-				free(kbd);
-			}
-		} while (kbd != NULL);
-		if (ch == 'q') {
-			goto done;
-			break;
-		}
-		syscall_yield();
-		//syscall_wait(wins_globals->server_pid);
-	}
-done:
-
-#if 1
-	teardown_windowing();
-#endif
-
-	return 0;
-}