Fixed various zombie accesses.
Merge branch 'master' into cutting-edge