Fixed issues with amd definitions.