Fix bugs in start phase