Removed minor incompatibilities with C89