diff --git a/.travis.yml b/.travis.yml
index 3166ed78342952aff8588a4a35dcee28ccd885ad..1131bff3a7725aad321d3a12a0f3455f8561f1d0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -227,7 +227,6 @@ matrix:
       - compiler: clang-3.9
       - compiler: clang-4.0
       - compiler: clang-5.0
-      - compiler: gcc-8
 
 cache:
   apt: true
diff --git a/src/r_segs.c b/src/r_segs.c
index 6d6ba1efd1c0dd7a62cfd130df0e2cc08adfa133..6bdc8eabc988bfd22d31fdee6f12c4cd23f03907 100644
--- a/src/r_segs.c
+++ b/src/r_segs.c
@@ -1126,6 +1126,9 @@ void R_RenderThickSideRange(drawseg_t *ds, INT32 x1, INT32 x2, ffloor_t *pfloor)
 			// Get data for the column
 			col = (column_t *)((UINT8 *)R_GetColumn(texnum,maskedtexturecol[dc_x]) - 3);
 
+			// guess what I just fixed? -monster psychic cat
+			dc_colormap = colormaps;
+
 			// SoM: New code does not rely on R_DrawColumnShadowed_8 which
 			// will (hopefully) put less strain on the stack.
 			if (dc_numlights)
diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c
index dad3b941f53e5b9c641151ce1e7af90c94b4011f..6a5ec3daaed3f2aaf1564d9a9f71c66e09d1fb62 100644
--- a/src/sdl/i_video.c
+++ b/src/sdl/i_video.c
@@ -360,6 +360,7 @@ static INT32 Impl_SDL_Scancode_To_Keycode(SDL_Scancode code)
 
 static void SDLdoUngrabMouse(void)
 {
+	SDL_ShowCursor(SDL_ENABLE);
 	SDL_SetWindowGrab(window, SDL_FALSE);
 	wrapmouseok = SDL_FALSE;
 	SDL_SetRelativeMouseMode(SDL_FALSE);
@@ -369,6 +370,7 @@ void SDLforceUngrabMouse(void)
 {
 	if (SDL_WasInit(SDL_INIT_VIDEO)==SDL_INIT_VIDEO && window != NULL)
 	{
+		SDL_ShowCursor(SDL_ENABLE);
 		SDL_SetWindowGrab(window, SDL_FALSE);
 		wrapmouseok = SDL_FALSE;
 		SDL_SetRelativeMouseMode(SDL_FALSE);
@@ -1553,9 +1555,18 @@ void I_StartupGraphics(void)
 	realheight = (Uint16)vid.height;
 
 	VID_Command_Info_f();
-	if (!disable_mouse) SDL_ShowCursor(SDL_DISABLE);
 	SDLdoUngrabMouse();
 
+	SDL_RaiseWindow(window);
+
+	if (mousegrabok && !disable_mouse)
+	{
+		SDL_ShowCursor(SDL_DISABLE);
+		SDL_SetRelativeMouseMode(SDL_TRUE);
+		wrapmouseok = SDL_TRUE;
+		SDL_SetWindowGrab(window, SDL_TRUE);
+	}
+
 	graphics_started = true;
 }