More bugfixes. Remove link resolution in plugin since we do it at the end.