Fixes for bootstrap scoping