Issues #147 (USRBDX) and #152 (USRYIELD)