Follow recent Alix changes