Linux fixes #734 try 2