Fixed documentation
Last fixes before 4.2