Fix unlinked vars