Improved some stuff for installation process