Clean up and warning fix.
Merge branch 'master' of https://github.com/heidi-ann/zygote
Merge branch 'master' of https://github.com/heidi-ann/zygote