Fix requirements issues (add optional_policy)