Better device detection.