Fixed issues for linux