Some improves for installation