Fix ADM support to avoid error messages.