Improve machine detection