Addons are not mandatory.
Fix locking order issue.