Some installation improvements