Warning cleanups, deprecation changes.