Added more OPTIONS_(UN)SET to make.conf