Addon compatibilty fixes