Update linking changes to work properly without errors. One remaining mistake (no point in using this right now until further notice).