Improve AMD support for naive AMD loaders