More ship fixes