Are they ever going to fix these two things?

1) That you can leap straight out of the water while swimming in deep water.
2) That you can grab a ladder at the end of a long fall and be fine.

Just wondering because they kind of harm the immersion factor a bit for me, personally.