Fixup some aliases