- made some fixes for linux