Fix installer
Improve uninstaller