Various Archipelago improvements