(nearest) C89 build fixes