Fixed functions highlighting issues