Optimisations

Damn it Sentry!