Ferry fix, map adjustments