Fixes for Sentry 6.0.0 compatibility

Getting some errors with Sentry 6.0.0, hopefully fixed most of them.