Fix bugs during coldstart

Fix bugs during coldstart