fix more random errors
Merge pull request #787 from zendesk/grosser/rand

fix more random errors