Fix boot strap imports