Some package installer fixes