XP restoration bugs

Recently started the game on PS5, noticed 2 XP restoration bugs.

In Cere's base on Jedha if you jump onto the elevator instead of waiting for it to come up to you, you may die from fall damage. If this happens you can't collect your XP back because it's bugged.

If I die to the droids on top of the Spawn of Ogdo later I can't get my XP back. This also happens if I die mid-air to a blaster in this area. Also, sometimes if I die to Ogdo my XP does not show up 😭.