Fix remaining RMA specs in core, reduce amount of spec setup needed