Patch for compile errors