Mangrove fixes