Fixes for AMD integration