Fix some highlighting issues