bootstrap fixes
fix