Various alias fixes (2)