RMA Spec Fixes