Stop safari from blowing up

Fixes #138 and #173 

@zackbloom @TrevorBurnham @marcneuwirth