Fixed up C99 problems