Fixes for Data Explorer.