diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 74e1e3f3d..952925856 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -5,6 +5,7 @@ D1X-Rebirth Changelog
 arch/sdl/event.c: Still send idle events when receiving SDL joystick events, fixing possible joystick issues
 main/menu.c: No referring to non-existent ogl_maxanisotropy for non-OGL build
 main/kconfig.c, main/newmenu.c, ui/mouse.c: Fix cursor recentering issues - comment out redundant event_toggle_focus(1) calls in kconfig.c and newmenu.c and use event_toggle_focus(0) in ui_mouse_show()
+arch/ogl/ogl.c: Before duplicating last pixel column or row in ogl_filltexbuf, make sure we are still in actual bitmap boundaries
 
 20110116
 --------
diff --git a/arch/ogl/ogl.c b/arch/ogl/ogl.c
index 010e10e5d..f9f407eca 100644
--- a/arch/ogl/ogl.c
+++ b/arch/ogl/ogl.c
@@ -1287,11 +1287,11 @@ void ogl_filltexbuf(unsigned char *data, GLubyte *texp, int truewidth, int width
 					c = data[i++];
 				}
 			}
-			else if (x==width) // end of bitmap reached - fill this pixel with last color to make a clean border when filtering this texture
+			else if (x == width && y < height) // end of bitmap reached - fill this pixel with last color to make a clean border when filtering this texture
 			{
 				c = data[(width*(y+1))-1];
 			}
-			else if (y==height) // end of bitmap reached - fill this row with color or last row to make a clean border when filtering this texture
+			else if (y == height && x < width) // end of bitmap reached - fill this row with color or last row to make a clean border when filtering this texture
 			{
 				c = data[(width*(height-1))+x];
 			}
diff --git a/main/automap.c b/main/automap.c
index 9977ad857..1a8a90251 100644
--- a/main/automap.c
+++ b/main/automap.c
@@ -477,7 +477,9 @@ int automap_idle(window *wind, d_event *event, automap *am)
 	}
 	
 	vm_angles_2_matrix(&tempm,&am->tangles);
-	vm_matrix_x_matrix(&am->viewMatrix,&Objects[Players[Player_num].objnum].orient,&tempm);
+// 	vm_matrix_x_matrix(&am->viewMatrix,&Objects[Players[Player_num].objnum].orient,&tempm);
+	Objects[Players[Player_num].objnum].orient = am->viewMatrix = tempm;
+	
 	
 	if ( am->viewDist < ZOOM_MIN_VALUE ) am->viewDist = ZOOM_MIN_VALUE;
 	if ( am->viewDist > ZOOM_MAX_VALUE ) am->viewDist = ZOOM_MAX_VALUE;