- Added some fixes for linux