more alias fixes