Martin's bs-rel fixes