Various alias fixes