Merge some fix from trunk.