Making some small changes for BCHyrdo