As you guys know, many of the traits are designed for land operations. For example traits to boost rifles, which is used on land only.
Currently the traits won't change when you go from land to underwater, or vice versa. So each time you change, you have to adjust your traits yourself.
I recommend that there be a separation between the two, so there are two sets of traits. Its similar to a weapon switch between the two, but for traits. So then the players can dive right in and start playing.