Fix alias management.