Fixed some issue on the first phase.

Fixed some issue on the first phase.