Fix bugs captured during ColdStart

Fix bugs captured during ColdStart