Fix up leftover merge errors/missed updates