fixes for linux and win