Improvements on Linux