Minor changes for C89 compability