Minor installation bugs fixes.