Couple alias fixes to go with the previous commit.