Tweaks to AMD support