Fix for new autoconf and CAM support