Update misc
Update bootstrap code