Improve linux support 2