Fixing issues with linux