Checkpoint URI fixups, and 1.8.7 stuff