Removed warnings from APM code