Temporary Fixes for DirectCredit