How about Cantina dude randomly appearing on Jedha, escaping its destruction I guess, then going to Tatooine like a day later for some reason?I think it would have made more sense
If the R2D2 and C3P0 cameos were directly at the end in the same room as Leia when she reserved the plans from the one rebel soldier. Having them on Yavin 4 makes it a bit more odd because that means the Tantive IV was landed somewhere on that planet to pick them up.