Fix small issues in 2-4