diff --git a/reactos/drivers/input/sermouse/detect.c b/reactos/drivers/input/sermouse/detect.c
index dbb3a63df05..e3db473780a 100644
--- a/reactos/drivers/input/sermouse/detect.c
+++ b/reactos/drivers/input/sermouse/detect.c
@@ -186,7 +186,7 @@ SermouseDetectLegacyDevice(
 		&Fcr, sizeof(Fcr), NULL, NULL);
 	if (!NT_SUCCESS(Status)) goto ByeBye;
 	/* Set serial port speed */
-	BaudRate = SERIAL_BAUD_1200;
+	BaudRate = 1200;
 	Status = SermouseDeviceIoControl(LowerDevice, IOCTL_SERIAL_SET_BAUD_RATE,
 		&BaudRate, sizeof(BaudRate), NULL, NULL);
 	if (!NT_SUCCESS(Status)) goto ByeBye;
diff --git a/reactos/drivers/input/sermouse/fdo.c b/reactos/drivers/input/sermouse/fdo.c
index a20fa5a14e0..ec8b7bd7e17 100644
--- a/reactos/drivers/input/sermouse/fdo.c
+++ b/reactos/drivers/input/sermouse/fdo.c
@@ -115,8 +115,6 @@ cleanup:
 	Fdo->Flags |= DO_BUFFERED_IO;
 	Fdo->Flags &= ~DO_DEVICE_INITIALIZING;
 
-	/* FIXME: create registry entry in HKEY_LOCAL_MACHINE\HARDWARE\DEVICEMAP */
-
 	ExFreePool(DeviceNameU.Buffer);
 
 	return STATUS_SUCCESS;
@@ -124,6 +122,8 @@ cleanup:
 cleanupFDO:
 	if (DeviceExtension)
 	{
+		if (DeviceExtension->LowerDevice)
+			IoDetachDevice(DeviceExtension->LowerDevice);
 		ExFreePool(DeviceExtension->MouseInputData[0]);
 		ExFreePool(DeviceExtension->MouseInputData[1]);
 	}
@@ -177,7 +177,7 @@ SermouseStartDevice(
 		/* Override the number of buttons */
 		DeviceExtension->AttributesInformation.NumberOfButtons = DeviceExtension->DriverExtension->NumberOfButtons;
 
-	DeviceExtension->AttributesInformation.SampleRate = 1200 / 8;
+	DeviceExtension->AttributesInformation.SampleRate = DeviceExtension->DriverExtension->SampleRate / 8;
 	DeviceExtension->AttributesInformation.InputDataQueueLength = DeviceExtension->DriverExtension->MouseDataQueueSize;
 	DeviceExtension->MouseType = MouseType;
 	DeviceExtension->PnpState = dsStarted;
diff --git a/reactos/drivers/input/sermouse/readmouse.c b/reactos/drivers/input/sermouse/readmouse.c
index 479095ebee4..4a52f92eaba 100644
--- a/reactos/drivers/input/sermouse/readmouse.c
+++ b/reactos/drivers/input/sermouse/readmouse.c
@@ -172,7 +172,7 @@ SermouseDeviceWorker(
 		for (i = 0; i < ioStatus.Information; i++)
 		{
 			ReceivedByte = Buffer[i];
-			DPRINT1("ReceivedByte 0x%02x\n", ReceivedByte);
+			DPRINT("ReceivedByte 0x%02x\n", ReceivedByte);
 
 			/* Synchronize */
 			if ((ReceivedByte & 0x40) == 0x40)