Port of bsvc to modern macs