merge fixes on Linux