Changes for Addon Compatibility.

Changes needed for the official Frodo Release.