Forks improvements