Improve forks support and ssh support