Improve Linux compatibility