WIP(bootstrap) fix various problems in bootstrap step