some minor C89 compatibility changes