Fixed RFCUtils so all tests pass