- rel 3; build fixes