Better OS detection and inclusion per distribution