Replace some boundles with working ones