Highlighting issues resolved

.