Glimpse API fix.
Merged with Julie's changes.