Fixed issues on Linux