Resolves aliases
Fix alias resolving