Aliases fixes #681

Fixes for references to aliases issue 681