Fixes a couple bugs from the wonkiness of addonType