third-party/fixups