Improving safety of vessels