Fix bugs with start.

Change-Id: I4e3ad7443f07de390c368e483d1e5e4f754857dd