Fixed more issues when under stress

Fixes #9