Part 1 of UHS marine fixes.