Add and fix some aliases