Correct 4.2 deployment issues