Adjust borsch to recent changes