diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index 51c8969b8..ff1370433 100644
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -58,8 +58,7 @@ long calc_swapsize(long memory, long disk) {
 	if (memory > 1024) {
 		return 512;
 	}
-
-	return memory*2;
+	return memory;
 }
 
 long calc_rootsize(long free, long max) {
@@ -155,9 +154,9 @@ int main(int argc, char *argv[])
 	mysystem("/sbin/modprobe generic");
 	mysystem("/sbin/modprobe ide-cd");
 	mysystem("/sbin/modprobe ide-disk");
-	mysystem("/sbin/modprobe uhci_hcd");
-	mysystem("/sbin/modprobe ohci_hcd");
-	mysystem("/sbin/modprobe ehci_hcd");
+	mysystem("/sbin/modprobe uhci-hcd");
+	mysystem("/sbin/modprobe ohci-hcd");
+	mysystem("/sbin/modprobe ehci-hcd");
 	mysystem("/sbin/modprobe ohci1394");
 	mysystem("/sbin/modprobe sd_mod");
 	mysystem("/sbin/modprobe sr_mod");
diff --git a/src/install+setup/install/mountsource.sh b/src/install+setup/install/mountsource.sh
index bd89b4edc..cf261d36d 100644
--- a/src/install+setup/install/mountsource.sh
+++ b/src/install+setup/install/mountsource.sh
@@ -27,7 +27,7 @@ for DEVICE in $(kudzu -qps -t 30 -c HD | grep device: | cut -d ' ' -f 2 | sort |
 		umount /cdrom 2> /dev/null
 done
 
-if [ -e /tmp/source_device ]; then
+if [ -e "/tmp/source_device" ]; then
 	mount /dev/$(cat /tmp/source_device) /cdrom 2> /dev/null
 	exit 0
 else