diff --git a/cgi.d b/cgi.d
index 5eb4ecb..b0e6f2d 100644
--- a/cgi.d
+++ b/cgi.d
@@ -2007,6 +2007,7 @@ class Cgi {
 			uri ~= "s";
 		uri ~= "://";
 		uri ~= host;
+		version(none)
 		if(!(!port || port == defaultPort)) {
 			uri ~= ":";
 			uri ~= to!string(port);
diff --git a/nanovega.d b/nanovega.d
index db07dba..e4fabbd 100644
--- a/nanovega.d
+++ b/nanovega.d
@@ -12461,7 +12461,11 @@ enum GLMaskState {
   JustCleared = 2,
 }
 
-final class GLNVGTextureLocker {}
+import core.sync.mutex;
+__gshared Mutex GLNVGTextureLocker;
+shared static this() {
+	GLNVGTextureLocker = new Mutex();
+}
 
 struct GLNVGcontext {
   private import core.thread : ThreadID;
@@ -12630,16 +12634,16 @@ bool glnvg__deleteTexture (GLNVGcontext* gl, ref int id) nothrow @trusted @nogc
       // alas, we aren't doing frame business, so we should postpone deletion
       version(nanovega_debug_textures) {{ import core.stdc.stdio; printf("*** POSTPONED texture deletion with id %d (%d); glid=%u\n", tx.id, id, tx.tex); }}
       version(aliced) {
-        synchronized(GLNVGTextureLocker.classinfo) {
+	{
+        GLNVGTextureLocker.lock_nothrow; scope(exit) GLNVGTextureLocker.unlock_nothrow;
           tx.id = 0; // mark it as dead
           gl.mustCleanTextures = true; // set "need cleanup" flag
-        }
+	}
       } else {
         try {
-          synchronized(GLNVGTextureLocker.classinfo) {
+            GLNVGTextureLocker.lock_nothrow; scope(exit) GLNVGTextureLocker.unlock_nothrow;
             tx.id = 0; // mark it as dead
             gl.mustCleanTextures = true; // set "need cleanup" flag
-          }
         } catch (Exception e) {}
       }
     }
@@ -13615,7 +13619,8 @@ void glnvg__renderViewport (void* uptr, int width, int height) nothrow @trusted
       } else {
         if (gl.mainTID != Thread.getThis.id) assert(0, "NanoVega: cannot use context in alien thread");
       }
-      synchronized(GLNVGTextureLocker.classinfo) {
+      {
+        GLNVGTextureLocker.lock_nothrow; scope(exit) GLNVGTextureLocker.unlock_nothrow;
         gl.mustCleanTextures = false;
         foreach (immutable tidx, ref GLNVGtexture tex; gl.textures[0..gl.ntextures]) {
           // no need to use atomic ops here, as we're locked
diff --git a/terminal.d b/terminal.d
index 83cfe68..f13ecc3 100644
--- a/terminal.d
+++ b/terminal.d
@@ -2075,8 +2075,11 @@ http://msdn.microsoft.com/en-us/library/windows/desktop/ms683193%28v=vs.85%29.as
 					_cursorX = 0;
 				break;
 				case '\t':
-					_cursorX ++;
-					_cursorX += _cursorX % 8; // FIXME: get the actual tabstop, if possible
+					// FIXME: get the actual tabstop, if possible
+					int diff = 8 - (_cursorX % 8);
+					if(diff == 0)
+						diff = 8;
+					_cursorX += diff;
 				break;
 				default:
 					_cursorX++;
@@ -4995,8 +4998,34 @@ class LineGetter {
 						if(terminal.cursorX + 2 < terminal.width) {
 							remaining = terminal.width - terminal.cursorX - 2;
 						}
-						if(remaining > 8)
-							terminal.write(remaining < help.length ? help[0 .. remaining] : help);
+						if(remaining > 8) {
+							string msg = help;
+							foreach(idxh, dchar c; msg) {
+								remaining--;
+								if(remaining <= 0) {
+									msg = msg[0 .. idxh];
+									break;
+								}
+							}
+
+							/+
+							size_t use = help.length < remaining ? help.length : remaining;
+
+							if(use < help.length) {
+								if((help[use] & 0xc0) != 0x80) {
+									import std.utf;
+									use += stride(help[use .. $]);
+								} else {
+									// just get to the end of this code point
+									while(use < help.length && (help[use] & 0xc0) == 0x80)
+										use++;
+								}
+							}
+							auto msg = help[0 .. use];
+							+/
+							if(msg.length)
+								terminal.write(msg);
+						}
 					}
 					terminal.writeln();