adopt latest muack (0.7.0) changes