Seaworld has added barriers to provide a wall between trainers and their killer whales.  These are considered temporary, but I fear they may not ever put the trainers back in the water with the whales, which will be a shame.   I understand there are risks involved, but the same could be said for most any animal trainer who deals with large animals.