Make more C89 and POSIX compliant