Some C89 build fixes