Port to latest mirage API changes