diff --git a/Makefile b/Makefile
index d901a7a..8156ba8 100644
--- a/Makefile
+++ b/Makefile
@@ -55,6 +55,8 @@ ifeq ($(HEADLESS),YES)
 	HEADLESS_GRUB = sed -i -f grub-headless.sed $(CHROOT)/boot/grub/grub.conf
 endif
 
+gcc_config = chroot $(CHROOT) gcc-config 1
+
 export APPLIANCE ACCEPT_KEYWORDS CHROOT EMERGE HEADLESS M4 M4C 
 export HOSTNAME MAKEOPTS PRUNE_CRITICAL TIMEZONE USEPKG WORLD
 
@@ -120,7 +122,7 @@ $(CHROOT)/boot/vmlinuz: base_system $(KERNEL_CONFIG)
 	chroot $(CHROOT) cp /usr/share/zoneinfo/$(TIMEZONE) /etc/localtime
 	chroot $(CHROOT) $(EMERGE) -n $(USEPKG) sys-kernel/$(KERNEL)
 	cp $(KERNEL_CONFIG) $(CHROOT)/usr/src/linux/.config
-	chroot $(CHROOT) gcc-config 1
+	$(gcc_config)
 	chroot $(CHROOT) make $(MAKEOPTS) -C /usr/src/linux oldconfig
 	chroot $(CHROOT) make $(MAKEOPTS) -C /usr/src/linux
 	chroot $(CHROOT) make $(MAKEOPTS) -C /usr/src/linux modules_install
@@ -148,6 +150,7 @@ sysconfig: preproot $(SWAP_FILE) $(CHROOT)/etc/fstab $(CHROOT)/etc/conf.d/hostna
 	sed -i 's/^#s0:/s0:/' $(CHROOT)/etc/inittab
 	$(HEADLESS_INITTAB)
 	echo 'config_eth0=( "dhcp" )' > $(CHROOT)/etc/conf.d/net
+	chroot $(CHROOT) ln -nsf net.lo /etc/init.d/net.eth0
 	chroot $(CHROOT) rc-update add net.eth0 default
 	chroot $(CHROOT) rc-update del consolefont boot
 	touch sysconfig
@@ -176,16 +179,17 @@ software: systools issue etc-update.conf $(CRITICAL) $(WORLD)
 	chroot $(CHROOT) $(EMERGE) -1n $(USEPKG) app-arch/xz-utils
 	
 	chroot $(CHROOT) $(EMERGE) $(USEPKG) --update --newuse --deep `cat $(WORLD)`
-	chroot $(CHROOT) gcc-config 1
+	$(gcc_config)
 	
 	# Need gentoolkit to run revdep-rebuild
 	chroot $(CHROOT) $(EMERGE) -1n $(USEPKG) app-portage/gentoolkit
 	chroot $(CHROOT) revdep-rebuild -i
 	
 	cp issue $(CHROOT)/etc/issue
-	chroot $(CHROOT) gcc-config 1
+	$(gcc_config)
 	chroot $(CHROOT) $(EMERGE) $(USEPKG) --update --newuse --deep world
 	chroot $(CHROOT) $(EMERGE) --depclean --with-bdeps=n
+	$(gcc_config)
 	chroot $(CHROOT) etc-update
 	$(MAKE) -C $(APPLIANCE) postinstall
 	chroot $(CHROOT) passwd -d root
diff --git a/kde/Makefile b/kde/Makefile
index 3a323ce..90f8faf 100644
--- a/kde/Makefile
+++ b/kde/Makefile
@@ -2,13 +2,15 @@
 preinstall:
 	echo 'USE="$$USE qt3support xcomposite opengl"' >>  "$(CHROOT)"/etc/make.conf;
 
-postinstall: kdmrc Xaccess
+postinstall: kdmrc Xaccess local
 	cp kdmrc Xaccess "$(CHROOT)"/usr/share/config/kdm
 	chroot "$(CHROOT)" rc-update add dbus default
-	if [ -e "$(CHROOT)"/etc/conf.d/xdm ]; then                            \
+	if [ -e "$(CHROOT)"/etc/conf.d/xdm ]; then                             \
     	sed -i 's/^DISPLAYMANAGER=.*/DISPLAYMANAGER="kdm"/'                \
 		"$(CHROOT)"/etc/conf.d/xdm;                                        \
 		chroot "$(CHROOT)" rc-update add xdm default;                      \
+	elif [ -f "$(CHROOT)/etc/conf.d/local" ]; then                         \
+		cp local  "$(CHROOT)/etc/conf.d/local";                            \
 	else                                                                   \
 		echo "/usr/bin/kdm -daemon" >> "$(CHROOT)"/etc/conf.d/local.start; \
 	fi