Fixed bugs in installer- and uninstaller-routine