Fix AMP warnings
Merge pull request #1495 from thoughtpolice/amp-fix

Fix AMP warnings