Fix restructure related problems.