Fixed function issues, improved alias generation