Fixed more highlight & linking errors.