AMD simpler require

Some fixes which make things simpler.