More fixes for memory highlighting