RFD fixes