diff --git a/src/Graphics_N64.c b/src/Graphics_N64.c
index 2c165205f..8aee1d829 100644
--- a/src/Graphics_N64.c
+++ b/src/Graphics_N64.c
@@ -139,8 +139,8 @@ static GfxResourceID Gfx_AllocTexture(struct Bitmap* bmp, cc_uint8 flags, cc_boo
 	glGenTextures(1, &tex->textureID);
 	glBindTexture(GL_TEXTURE_2D, tex->textureID);
 	// NOTE: Enabling these fixes textures, but seems to break on cen64
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, mipmaps ? GL_LINEAR : GL_NEAREST);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, mipmaps ? GL_LINEAR : GL_NEAREST);
 	
 	tex->surface   = surface_alloc(bit16 ? FMT_RGBA16 : FMT_RGBA32, bmp->width, bmp->height);
 	surface_t* fb  = &tex->surface;
diff --git a/src/Menus.c b/src/Menus.c
index 609a9bd6d..f8e3dbe5b 100644
--- a/src/Menus.c
+++ b/src/Menus.c
@@ -2941,8 +2941,13 @@ static void GraphicsOptionsScreen_InitWidgets(struct MenuOptionsScreen* s) {
 			GraphicsOptionsScreen_GetNames,   GraphicsOptionsScreen_SetNames },
 		{ 1,   0,  "Shadows", MenuOptionsScreen_Enum,
 			GraphicsOptionsScreen_GetShadows, GraphicsOptionsScreen_SetShadows },
+#ifdef CC_BUILD_N64
+		{ 1,  50,  "Filtering", MenuOptionsScreen_Bool,
+			GraphicsOptionsScreen_GetMipmaps, GraphicsOptionsScreen_SetMipmaps }
+#else
 		{ 1,  50,  "Mipmaps", MenuOptionsScreen_Bool,
 			GraphicsOptionsScreen_GetMipmaps, GraphicsOptionsScreen_SetMipmaps }
+#endif
 	};
 
 	s->numCore      = 8;
diff --git a/src/Window_3DS.c b/src/Window_3DS.c
index 3644b6782..e4d8b8ae5 100644
--- a/src/Window_3DS.c
+++ b/src/Window_3DS.c
@@ -40,8 +40,8 @@ void Window_Init(void) {
 	DisplayInfo.Width  = height; // deliberately swapped
 	DisplayInfo.Height = width;  // deliberately swapped
 	DisplayInfo.Depth  = 4; // 32 bit
-	DisplayInfo.ScaleX = 0.5;
-	DisplayInfo.ScaleY = 0.5;
+	DisplayInfo.ScaleX = 0.5f;
+	DisplayInfo.ScaleY = 0.5f;
 	
 	Window_Main.Width   = height; // deliberately swapped
 	Window_Main.Height  = width;  // deliberately swapped
diff --git a/src/Window_N64.c b/src/Window_N64.c
index b69a7f483..05dfa329d 100644
--- a/src/Window_N64.c
+++ b/src/Window_N64.c
@@ -40,6 +40,10 @@ void Window_Init(void) {
 	// change defaults to make more sense for N64
 	cc_uint8* binds = (cc_uint8*)KeyBind_GamepadDefaults;
 	binds[KEYBIND_INVENTORY] = CCPAD_Z;
+	binds[KEYBIND_FORWARD]   = CCPAD_CUP;
+	binds[KEYBIND_BACK]      = CCPAD_CDOWN;
+	binds[KEYBIND_LEFT]      = CCPAD_CLEFT;
+	binds[KEYBIND_RIGHT]     = CCPAD_CRIGHT;
 }
 
 void Window_Free(void) { }