Minor safety fixes; still broken
Merge branch 'master' of https://github.com/heidi-ann/zygote