fixes for Linux