4.2 build fixes