Feature multiple safety issues

Fixes #88.