various fixes
bootstrap fixes