diff --git a/smallmap_gui.c b/smallmap_gui.c
index 48baba8622..6ba0a6228e 100644
--- a/smallmap_gui.c
+++ b/smallmap_gui.c
@@ -330,7 +330,7 @@ static void DrawSmallMapStuff(byte *dst, uint xc, uint yc, int pitch, int reps,
 
 	do {
 		// check if the tile (xc,yc) is within the map range
-		if (xc < MapSizeX() - 1 && yc < MapSizeY() - 1) {
+		if (xc < MapMaxX() && yc < MapMaxY()) {
 			// check if the dst pointer points to a pixel inside the screen buffer
 			if (dst > _screen.dst_ptr && dst < dst_ptr_end)
 				WRITE_PIXELS_OR(dst, proc(TILE_XY(xc, yc)) & mask );
diff --git a/terraform_gui.c b/terraform_gui.c
index a0eed2314a..3ffde84075 100644
--- a/terraform_gui.c
+++ b/terraform_gui.c
@@ -135,7 +135,7 @@ static void TerraformClick_Raise(Window *w)
 
 static void TerraformClick_Level(Window *w)
 {
-	HandlePlacePushButton(w, 6, ANIMCURSOR_LOWERLAND, 2, PlaceProc_LevelLand);
+	HandlePlacePushButton(w, 6, SPR_CURSOR_LEVEL_LAND, 2, PlaceProc_LevelLand);
 }
 
 static void TerraformClick_Dynamite(Window *w)