[fix] Minor bugs during bootstrap.