Fix some support-originating specs