Bootstrap fix
Spec fixes
Add address migration