fix bootstrap and migration