Changes for AceAddon Incompatability