Attempting to get rid of AMO warnings