Cleaned up some warnings. No function change.