Improve linux support