Update fixes in 2.4.2 [ci-skip]