Navigation and Navigable Waters, and Shipping; Technical, Organizational, and Conforming Amendments