Fix up next wave of ports