Fix Holder move operations