c89 fixes #3