CSD compatibility changes

Added in the tooltip code from the CSD version of this file.