BDMS Issue Fixes