Little update to latest Alix changes