bdk fixes