Fixes for AMD