Cleaned up some of the alerts
Merge branch 'marty'