Update stuff for TC4.1 beta4.