let-343: fixes for bootstrap conflicts
let-346: fixes for text