Fix alias builder