Features/sentry fixes

Fixes #19