Upgrade deprecation cop for some issue fixes