Few improvments under Linux