Fix C99 compliance problems