diff --git a/cores/NES/src/NES_ZXUNO.v b/cores/NES/src/NES_ZXUNO.v
index db51913..f52aa48 100644
--- a/cores/NES/src/NES_ZXUNO.v
+++ b/cores/NES/src/NES_ZXUNO.v
@@ -144,7 +144,7 @@ module NES_ZXUNO(
   wire [7:0] joystick1, joystick2;
   wire p_sel = !host_select;
   wire p_start = !host_start;
-  assign joystick1 = {~P_R, ~P_L, ~P_D, ~P_U, ~p_start | (~P_R & ~P_L), ~p_sel | (~P_D & ~P_U), ~P_tr, ~P_A};  
+  assign joystick1 = {~P_R & P_L, ~P_L & P_R, ~P_D & P_U, ~P_U & P_D, ~p_start | (~P_R & ~P_L), ~p_sel | (~P_D & ~P_U), ~P_tr, ~P_A};  
  
   always @(posedge clk) begin
     if (joypad_strobe) begin
@@ -406,7 +406,7 @@ end
 //-----------------Multiboot-------------
     multiboot el_multiboot (
         .clk_icap(clk),
-        .REBOOT(master_reset)
+        .REBOOT(master_reset | (~P_R & ~P_L & ~P_D & ~P_U))
     );
 
 
diff --git a/cores/Oric/source/oric_zxuno_v2_v3.ucf b/cores/Oric/source/oric_zxuno_v2_v3.ucf
index b9a31b4..db042e2 100644
--- a/cores/Oric/source/oric_zxuno_v2_v3.ucf
+++ b/cores/Oric/source/oric_zxuno_v2_v3.ucf
@@ -23,8 +23,8 @@ NET "K7_TAPEOUT"      LOC="P9"   | IOSTANDARD = LVCMOS33;
 NET "K7_TAPEIN"       LOC="P105" | IOSTANDARD = LVCMOS33; 
 
 # Keyboard and mouse
-NET "PS2CLK1"         LOC="P98"  | IOSTANDARD = LVCMOS33 | SLEW = SLOW | DRIVE = 8;
-NET "PS2DAT1"         LOC="P97"  | IOSTANDARD = LVCMOS33 | SLEW = SLOW | DRIVE = 8;
+NET "PS2CLK1"         LOC="P98"  | IOSTANDARD = LVCMOS33 | PULLUP;
+NET "PS2DAT1"         LOC="P97"  | IOSTANDARD = LVCMOS33 | PULLUP;
 #NET "mouseclk"        LOC="P94"  | IOSTANDARD = LVCMOS33 | PULLUP;
 #NET "mousedata"       LOC="P95"  | IOSTANDARD = LVCMOS33 | PULLUP;
 
diff --git a/cores/Oric/source/oric_zxuno_v4.ucf b/cores/Oric/source/oric_zxuno_v4.ucf
index 3aae685..132f361 100644
--- a/cores/Oric/source/oric_zxuno_v4.ucf
+++ b/cores/Oric/source/oric_zxuno_v4.ucf
@@ -23,8 +23,8 @@ NET "K7_TAPEOUT"      LOC="P9"   | IOSTANDARD = LVCMOS33;
 NET "K7_TAPEIN"       LOC="P94"  | IOSTANDARD = LVCMOS33; 
 
 # Keyboard and mouse
-NET "PS2CLK1"         LOC="P99"  | IOSTANDARD = LVCMOS33 | SLEW = SLOW | DRIVE = 8;
-NET "PS2DAT1"         LOC="P98"  | IOSTANDARD = LVCMOS33 | SLEW = SLOW | DRIVE = 8;
+NET "PS2CLK1" LOC="P99" | IOSTANDARD = LVCMOS33 | PULLUP;
+NET "PS2DAT1" LOC="P98" | IOSTANDARD = LVCMOS33 | PULLUP;
 #NET "mouseclk"        LOC="P95"  | IOSTANDARD = LVCMOS33 | PULLUP;
 #NET "mousedata"       LOC="P97"  | IOSTANDARD = LVCMOS33 | PULLUP;
 
diff --git a/cores/VIC20/source/vic20_zxuno_v2_v3.ucf b/cores/VIC20/source/vic20_zxuno_v2_v3.ucf
index 7187e2f..14736f0 100644
--- a/cores/VIC20/source/vic20_zxuno_v2_v3.ucf
+++ b/cores/VIC20/source/vic20_zxuno_v2_v3.ucf
@@ -23,8 +23,8 @@ NET O_AUDIO_R         LOC="P9"   | IOSTANDARD = LVCMOS33 | SLEW = SLOW | DRIVE =
 NET EAR               LOC="P105" | IOSTANDARD = LVCMOS33;
 
 # Keyboard and mouse
-NET I_PS2_CLK         LOC="P98"  | IOSTANDARD = LVCMOS33 | DRIVE = 8 | SLEW = SLOW ; 
-NET I_PS2_DATA        LOC="P97"  | IOSTANDARD = LVCMOS33 | DRIVE = 8 | SLEW = SLOW ; 
+NET I_PS2_CLK         LOC="P98"  | IOSTANDARD = LVCMOS33 | PULLUP; 
+NET I_PS2_DATA        LOC="P97"  | IOSTANDARD = LVCMOS33 | PULLUP; 
 #NET "mouseclk"        LOC="P94"  | IOSTANDARD = LVCMOS33 | PULLUP;
 #NET "mousedata"       LOC="P95"  | IOSTANDARD = LVCMOS33 | PULLUP;
 
diff --git a/cores/VIC20/source/vic20_zxuno_v4.ucf b/cores/VIC20/source/vic20_zxuno_v4.ucf
index 051a814..0b064f1 100644
--- a/cores/VIC20/source/vic20_zxuno_v4.ucf
+++ b/cores/VIC20/source/vic20_zxuno_v4.ucf
@@ -23,8 +23,8 @@ NET O_AUDIO_R         LOC="P9"   | IOSTANDARD = LVCMOS33 | SLEW = SLOW | DRIVE =
 NET EAR               LOC="P94"  | IOSTANDARD = LVCMOS33;
 
 # Keyboard and mouse
-NET I_PS2_CLK         LOC="P99"  | IOSTANDARD = LVCMOS33 | DRIVE = 8 | SLEW = SLOW ; 
-NET I_PS2_DATA        LOC="P98"  | IOSTANDARD = LVCMOS33 | DRIVE = 8 | SLEW = SLOW ; 
+NET I_PS2_CLK         LOC="P99"  | IOSTANDARD = LVCMOS33 | PULLUP;
+NET I_PS2_DATA        LOC="P98"  | IOSTANDARD = LVCMOS33 | PULLUP; 
 #NET "mouseclk"        LOC="P95"  | IOSTANDARD = LVCMOS33 | PULLUP;
 #NET "mousedata"       LOC="P97"  | IOSTANDARD = LVCMOS33 | PULLUP;