Fix crashes

Repeat after me: I will not use canary builds for production. *AHEM*